Merge stage-aosp-master into pi-dev-plus-aosp Bug: 126125118 Change-Id: If9e509d67b18dc787fccf3e65bac30fcaa91d7bc